Skip to content

Story/vspc 172 #294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 156 commits into
base: develop
Choose a base branch
from
Open

Story/vspc 172 #294

wants to merge 156 commits into from
+976 −469

Conversation

bnayak4
Copy link
Contributor

@bnayak4 bnayak4 commented May 6, 2022 •
edited
Loading

Guidelines for Pull Requests

If you haven't yet read our code review guidelines, please do so, You can find them here.

Please confirm the following by adding an x for each item (turn [ ] into [x]).

  • I have removed all code style changes that are not necessary (e.g. changing blanks across the whole file that don’t need to be changed, adding empty lines in parts other than your own code)
  • I am not making any changes to files that don’t have any effect (e.g. imports added that don’t need to be added)
  • I do not have any sysout statements in my code or commented out code that isn’t needed anymore
  • I am not reformatting any files in the wrong format or without cause.
  • I am not changing file encoding or line endings to something else than UTF-8, LF
  • My pull request does not show an insane amount of files being changed although my ticket only requires a few files being changed
  • I have added Javadoc/documentation where appropriate
  • I have added test cases where appropriate
  • I have explained any part of my code/implementation decisions that is not be self-explanatory

Please provide a brief description of your ticket

(you can copy the ticket if it hasn't changed)

This is pradeeps' story and it consists of changes of VSPC-172,VSPC-196 and VSPC-197

Anything else the reviewer needs to know?

pradeep-017 and others added 30 commits August 20, 2021 16:22
@pradeep-017
[VSPC-172] Description pop up for spacelink, modulelink and externallink
8001301
@pradeep-017
[VSPC-172] Fixing the unit tests for latest changes of description as…
0172279 
… tootip for modulelinks, spacelinks
@pradeep-017
[VSPC-172] Changes completed for descrition in modulelinks, space lin…
c0274f7 
…ks and external links.
@pradeep-017
Merge branch 'develop' into story/VSPC-172
f69a469
@pradeep-017
[VSPC-172] Description for space and module links on public site
46d8c98
@pradeep-017
Code indentation fixes for space.html
e028619
@glend17
[VSPC-171] Added new SpaceBlock
bc51fc4
@glend17
[VSPC-171] Added SpaceBlock type functionality
7be602f
@glend17
[VSPC-171] Adding SpaceBlock functionality
5efc1a9
@glend17
[VSPC-171] Front-end changes
11aa526
@pradeep-017
[VSPC-194] Changes for module links addition and Ui changes for modul…
f50002c 
…e type and image selection
@glend17
[VSPC-171] Added drop down for staff to pick space to link to from sp…
1bb50c2 
…ace content block
@glend17
[VSPC-171] Bug checks
afb962c
@pradeep-017
[VSPC-194] Image Module link create and edit function completed
b6892fa
@glend17
[VSPC-171] Form fix
6ec14dd
@glend17
[VSPC-171] Space content block changes on slide.html
4d5a7a7
@glend17
[VSPC-171] Delete and edit related changes for space block
83b4e4d
@pradeep-017
[VSPC-194] Completed Unit tests
8c42767
@pradeep-017
[VSPC-194] COde cleanup
56ec4db
@glend17
[VSPC-171] Unit test
733d50f
@glend17
[VSPC-171] dropdown will keep track of selected space block
dca101f
@glend17
[VSPC-171] Code factor changes
5eb2f6e
@glend17
[VSPC-171] PR code review change
1fda47d
@glend17
[VSPC-171] Removing loggers
12aaaec
@pradeep-017
[VSPC-196] Changes for selecting existing image in SpaceLink
c5aef6c
@pradeep-017
[VSPC-196] Completed changes for selecting existing images for Spacel…
23c3726 
…ink(create, edit and delete), started with moduleLink create part
@pradeep-017
[VSPC-196] Completed create and delete part for external links. wip f…
6107df5 
…or edit part
@pradeep-017
[VSPC-196] Wip for unit tests for SpaceLink, ModuleLink and ExternalLink
8112992
@pradeep-017
[VSPC-196] Unit tests for spaceLink, ExternalLinks completed
60a2038
@pradeep-017
[VSPC-196] Changes for unit tests and image preview fixes
4edcda8
diya17 and others added 28 commits February 28, 2024 16:00
@diya17
[VSPC-172] Fixing UI
f9b2a90
@ajay3568yadav
VSPC-171 fixed null selection
3528a34
@ajay3568yadav
VSPC-171 block refreshing error
fc52972
@ajay3568yadav
VSPC-171 fixed space block deletion
4ad80fd
@ajay3568yadav
VSPC-171 removed console prints
94225ae
@ajay3568yadav
VSPC-171 review comments
38b05cd
@ajay3568yadav
VSPC-171 review comments and image block
accfa4a
@ajay3568yadav
VSPC-171 fixed the image block creation
f6e0615
@ajay3568yadav
VSPC-171 review comments
48cfd00
@ajay3568yadav
Merge branch 'develop' into story/vspc-171
88f6509
@ajay3568yadav
VSPC-171 review comments
d5bc0b2
@ajay3568yadav
VSPC-171 attempt to fix reordering of content blocks
abbaba5
@ajay3568yadav
VSPC-171 build fail fix
3128f1f
@ajay3568yadav
VSPC-172 added choose from existing option to the Spaces
fdf6de9
@ajay3568yadav
Merge branch 'story/VSPC-172' of https://github.com/diging/virtual-sp…
78ecadf 
…aces-2.0 into story/VSPC-172

Merge commit
@pooja-thalur
VSPC-172 fixed the issue with opening link
e858c3d
@ajay3568yadav
VSPC-196 added choose image option to modules and spaces
7a92d94
@ajay3568yadav
VSPC-196 merge conflicts
bc6c762
@pooja-thalur
Changes to display description
29d2ecd
@pooja-thalur
Merge branch 'story/VSPC-172' of https://github.com/diging/virtual-sp…
668976f 
…aces-2.0 into story/VSPC-172

# Conflicts:
#	vspace/src/main/webapp/WEB-INF/views/staff/spaces/space.html
@pooja-thalur
[VSPC-172] UI changes to show description
f7e30cb
@ajay3568yadav
[VSPC-196] fixed choose from existing images
05d90c2
@ajay3568yadav
VPSC-196 merge conflicts
aa4defb
@ajay3568yadav
VSPC-196 added choose from existing images to space, module and exter…
c7a778d 
…nal links
@ajay3568yadav
VSPC-196 fixed space link
8afaa88
@Girik1105
[VSPC-172] Fixed indendations
10b3652
@Girik1105
[VSPC-172] Fixed merge conflicts after merging develop
92225f6
@Girik1105
[VSPC-172] Fixed java exceptions
44b4d60
@Girik1105 Girik1105 reopened this Oct 1, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jdamerow jdamerow jdamerow requested changes

@AvirupBiswas AvirupBiswas Awaiting requested review from AvirupBiswas

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.